Fix Ambush modifiers incorrectly applying to unarmed attacks and channeled attacks - #10122
Open
Trifall wants to merge 1 commit into
Open
Fix Ambush modifiers incorrectly applying to unarmed attacks and channeled attacks #10122Trifall wants to merge 1 commit into
Trifall wants to merge 1 commit into
Conversation
mcagnion
suggested changes
Aug 30, 2026
| statMap = { | ||
| ["ambush_additional_critical_strike_chance_permyriad"] = { | ||
| mod("CritChance", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }), | ||
| mod("CritChance", "BASE", nil, bit.bor(ModFlag.Melee, ModFlag.Weapon), 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Ambush" }, { type = "SkillType", skillType = SkillType.NeverExertable, neg = true }, { type = "SkillType", skillType = SkillType.Triggered, neg = true }, { type = "SkillType", skillType = SkillType.Channel, neg = true }, { type = "SkillType", skillType = SkillType.OtherThingUsesSkill, neg = true }), |
Contributor
There was a problem hiding this comment.
An ordinary two-handed attack still receives both Ambush bonuses here. With Heavy Strike and a Corroded Blade on this head, enabling Ambush changed the final main-hand critical strike chance from 0.25% to 1.50%, the critical strike multiplier from 150% to 288%, and Total DPS from 1.4795 to 1.5193. GGG describes Ambush as exerting the next one-handed melee attack, so the generic ModFlag.Weapon mask makes the Rage Vortex weapon-swap accommodation apply to immediate two-handed attacks as well.
AI-assisted review disclosure: This finding was identified during a review using OpenAI Codex and confirmed with a focused reproduction.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #10093
Description of the problem being solved:
Ambush was incorrectly applying its critical strike chance and critical strike multiplier bonuses to unarmed attacks and attacks that cannot be exerted, such as Cyclone. Ambush only affects exertable melee attacks made with a weapon.
Tested in-game and also per the PoE Wiki on Ambush:
Only melee attacks with one-handed weapons are able to be exerted, providing a large amount of critical strike chance and critical strike multiplier for the exerted attack. Unarmed attacks and shield attacks cannot be exerted by Ambush.Steps taken to verify a working solution:
Link to a build that showcases this PR:
PoB for PoE1 build code (taken from issue):
Before screenshot:
After screenshot: